projects / siridb-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ae49081) | patch
fixed merging
authorAnja Bruls <anja@transceptor.technology>
Wed, 5 Dec 2018 15:26:04 +0000 (16:26 +0100)
committerAnja Bruls <anja@transceptor.technology>
Wed, 5 Dec 2018 15:26:04 +0000 (16:26 +0100)
commitaded73528dbe9a23595f06d165e5797d8191ca37
tree1c3f31b36869d48525d5a7a4fba7f66b07357695tree | snapshot
parentae490818c5c548fd4fda11c9fc2b57c0a1a30a52commit | diff
fixed merging
115 files changed:
dbtest/.accounts.dat [new file with mode: 0644] blob
dbtest/dbpath0/.accounts.dat [new file with mode: 0644] blob
dbtest/dbpath0/anja/.dropped [new file with mode: 0644] blob
dbtest/dbpath0/anja/.max_series_id [new file with mode: 0644] blob
dbtest/dbpath0/anja/buffer.dat [new file with mode: 0644] blob
dbtest/dbpath0/anja/database.conf [new file with mode: 0644] blob
dbtest/dbpath0/anja/database.dat [new file with mode: 0644] blob
dbtest/dbpath0/anja/groups.dat [new file with mode: 0644] blob
dbtest/dbpath0/anja/series.dat [new file with mode: 0644] blob
dbtest/dbpath0/anja/servers.dat [new file with mode: 0644] blob
dbtest/dbpath0/anja/users.dat [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/.dropped [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/.max_series_id [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/buffer.dat [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/database.conf [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/database.dat [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/groups.dat [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/series.dat [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/servers.dat [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000000.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000001.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000002.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000003.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000004.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000005.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000006.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000007.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000008.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000009.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000010.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000011.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000012.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000013.idx [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb [new file with mode: 0644] blob
dbtest/dbpath0/benchmark/users.dat [new file with mode: 0644] blob
dbtest/dbpath1/.accounts.dat [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/.dropped [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/buffer.dat [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/database.conf [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/database.dat [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/groups.dat [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/series.dat [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/servers.dat [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb [new file with mode: 0644] blob
dbtest/dbpath1/benchmark/users.dat [new file with mode: 0644] blob
dbtest/siridb-http.conf [new file with mode: 0644] blob
dbtest/siridb0.conf [new file with mode: 0644] blob
dbtest/siridb1.conf [new file with mode: 0644] blob
itest/run_all.py diff | blob | history
itest/test_select.py diff | blob | history
itest/test_select_ns.py [new file with mode: 0644] blob
src/siri/db/points.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.